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

Change-Id: Ia816fa6b23a7e5e6584692b02683320e9999c7d3