[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: f9df0133c0  -s ours am: ba602aa82a  -s ours
am: 9990f062c8  -s ours

Change-Id: I22edd05a764dd5132f684f07f4305e2f16864ddb