[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master
am: 10fe30c6a1 -s ours
am skip reason: subject contains skip directive

Change-Id: I4e750aa633bd3e8c1d759312ba5c4e246b4febb4