DO NOT MERGE

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

Bug: 120502534
Change-Id: Id5312899005265bc633d8c9cbc6e18c418e0f739