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

Change-Id: I8fd4681534c3716f79cfe4f12c27a3a8e807caad