DO NOT MERGE - Merge RQ1A.201205.011 am: 2324b78a22

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/13177017

Change-Id: I85d53a98d8267501d25b80663708cff98009021f