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

Change-Id: Ida1c26cf196198aa11a9c10aa39641ab81253aa2