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

Change-Id: If5b94e0de52c6f0fd03e42ce09c9b8bc5a3ba731