(cherry-pick of 8616c69985) (cherry picked from commit 66721821df) Bug: 21414325 Change-Id: I1a58823a372154589f972b98c4c428eab0e0523e
8616c69985
66721821df