DO NOT MERGE

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

Bug: 120502534
Change-Id: I1e725b112c3f3ecf6dd81ea9515cefa482b891fc