This reverts commit 9b70ab7a, reversing changes made to 153008ef. Bug: 24302031 Change-Id: Ia746381b30be3b54cb646ed412b7271962c4b02a