Bug: 27526885 Change-Id: I00f9da322e586b0de8ba62cd53427f7284e9fdbf (cherry-pick from commit 1e1ff59e)