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

Bug: 120502534
Change-Id: Ie69f42ab4207ae209e5dc00243d553bdd547137b