DO NOT MERGE

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

Bug: 120502534
Change-Id: I1e326f15cb9e928c6683926e3ea3166927d83344