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

Change-Id: Ib77d91e3cb7cf7bd06252cb3aa51824b99d356cf