DO NOT MERGE

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

Bug: 120502534
Change-Id: I3e6d570fdc1da3a6c33f8bc91046cb528e37910b