Bug: 27427000 Change-Id: I6eecd1c5da1587435876a04f51e5a9424149fba1 (cherry picked from commit 40f79bb5) (cherry picked from commit bfd9479b)