Bug: 15091403 Change-Id: Ibcae5aa99f40ce5efb0c006a11ed6fd4efddc829 (cherry picked from commit 015ab0eb)