[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001, history only) into master" am: 9d587e95e2  -s ours am: 1081965ce4  -s ours
am: 88b49f3e23  -s ours

Change-Id: I0df4a697393ec241d0db7ed10fa06a6f399b5581