(cherry pick of commit 421d4348) This reverts commit c954fde0. Bug: 25693940 Change-Id: I568051aad39e215d677318cd5758962e562187ef