This reverts commit 9c7b1319. Reason for revert: Fixed build failures due to merge Change-Id: I7d7bfed3a3234b966f3fe3fd6e0cbc63d2bedf83 Test: unit test