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

Change-Id: I81e116dfec84898030729c4382a0bdeb159b66d5