DO NOT MERGE

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

Bug: 120502534
Change-Id: I45b212dfb7e5a46a4d45cebf63b68ba381ef0054