[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master.
am: 87f090ba57 -s ours
am skip reason: subject contains skip directive

Change-Id: I2fb161dff7084788c521c82344a5ebb2dc5cc929