DO NOT MERGE

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

Bug: 120502534
Change-Id: Ia0e0b9ffb878bd02264ac73d5686a07e72ff83d3