DO NOT MERGE

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

Bug: 120502534
Change-Id: I984b9026be56bb5ea0a1994a620c266555fdcf8c