DO NOT MERGE

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

Bug: 120502534
Change-Id: I31f314435e9641931d8eabcd1c5cdf0208776305