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

Bug: 120502534
Change-Id: I9e566f6002a172fb5c2a46f5261991ef21033e31