Bug: 17713104 (cherry picked from commit 00851a53be) Change-Id: Ibddc535248a10e3534586eafb76c074332e025c4
00851a53be