DO NOT MERGE

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

Bug: 120502534
Change-Id: I1eabdc1fc4156ec782c1634d2ecbf4b68b49d509