Bug: 15419005 Change-Id: Ic80040ef0f306fb06f62b1d026a9160603903223 (cherry picked from commit 5a6f487b)