DO NOT MERGE

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

Bug: 120502534
Change-Id: I8646bd54ed9fb34dd2bdf8438102be6acad73bd2