DO NOT MERGE

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

Bug: 120502534
Change-Id: I91674ef1d53c77f43ceaa7edfb4a7942993a8115