This reverts commit 3785977ca6. Reason for revert: Fixing Change-Id: I31425d8086e3f1d1d806b84e9339d0acd3f420d4
3785977ca6