Revert part of 79eb7ba87b am: fd99009c52 am: 3379686f41 am: 8af676004d am: 8ccee513c1
Change-Id: I84a79cb0d969174f424662396bcf553d8dcba7ae
This commit is contained in: