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

Change-Id: I3c923eb5a3c2e9cb8ea72ea9978000db53f792c4