Revert part of 79eb7ba87b am: fd99009c52 am: 3379686f41 am: 0aa2a61c43 am: 9ca435e31a
Change-Id: Idf0d160f5eb4f4d6c4b310bc26fa01322c329a46
This commit is contained in: