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

Change-Id: I63ab98197677ca5bf7e7200b552a743b34b72b28