This reverts commit eca1190399. Reason for revert: extra commits Change-Id: I54870a508c95e92600d76385954c61c71160c4de
eca1190399