Bug: 14445579 Change-Id: I1d263ff6cffcb6e448761fca7ca4b06466ad65aa (cherry picked from commit 00699fa641)
00699fa641