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

Change-Id: I287cfc41f61fb755771cf0d375267795542639f8