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

Change-Id: I19f47c0969cfe095f9924149110c06a09f36a651