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

Change-Id: I844d644088acc9795c9421cbcb298cfa5f9e3774