Bug: 27972184 Change-Id: I4f80c74079087eab20b75a701c56cde141322462 (cherry picked from commit 3444dbe0)