Bug: 27298560 Change-Id: I8a89c9df753d12ee8af06008d424e77bb916cd8f (cherry picked from commit 4a457853)