This reverts commit f08d3d43. Reason for revert: <Merge abnormal in automerger> Change-Id: I0cdb401f4962050bf24dc9d9871d4ef15cf52629