
This reverts commit 46b279bb36b2647bf04097fe271586fca76f5ed0. The patch being reverted has broken the API compatibility. Until a fix for this issue has been created, the patch should be reverted. Change-Id: I1295c3e0d5ca228253874719befd7ed842d505fa Closes-Bug: #1521429