DO NOT MERGE

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

Bug: 120502534
Change-Id: I5bd49938d3a98c003e1e6d00769ae29863e16606