am: a4bb7ac6 Bug:38419944 Change-Id: If74ffd92284a9254fb8f0df776bf88b36b386558 (cherry picked from commit 20b7a957)