DO NOT MERGE

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

Bug: 120502534
Change-Id: I1ea67bcbe76be040ba7a1579be7355167a1cb2c5