[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
am: 6a907bc24a  -s ours

Change-Id: I2ea6d3259e64b0c48d8c81ead8acab7a7325c45e