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

Change-Id: I389bff0ad4400d898144cbd5905a2214f48925ef