Bug: 22023363 (cherry picked from commit 74a8e08d59) Change-Id: I0d7b756be123f806d035ee225960f27806785424
74a8e08d59