DO NOT MERGE

Merge pie-platform-release (PPRL.181205.001, history only) into master

Bug: 120502534
Change-Id: Ie7078074080bb8bf2716930b7b1085bfdf533a80