DO NOT MERGE

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

Bug: 120502534
Change-Id: I657b53f5f434191436b4725e1128cc10b7dcfece