This reverts commit cff2e40d19. Reason for revert: Attempt re-submit Change-Id: I8802b519e4ae3046858b854815ba580c7a6b965d
cff2e40d19