DO NOT MERGE

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

Bug: 120502534
Change-Id: I8d35ec27e0d099c338e9bd2fca8d1913882211dc