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

Change-Id: I274eb45d3f26e464b06ad33b4a5836b5d2f71598