[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 1083b621 -s ours am: 193454c2 -s ours Change-Id: I9220d2fbd647f37883e3fae57dddccb57660990a