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

Change-Id: I3cd2f3ead7463462056ef0fc8c43e81857b59fa5