DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master

Bug: 120502534
Change-Id: I8ed63e4edd07c68d7986551e6b30c02cdf8539f3