Bug: 27837319 Change-Id: I037158697a294c3e03f186f3b4207ea700321a8a (cherry picked from commit 1ee0ff3d)