BUG: 20765163 Change-Id: I13f36f76541216c5c1c20ae8866e09038e08e6f8 (cherry picked from AOSP commit 97627314)