DO NOT MERGE

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

Bug: 120502534
Change-Id: I5ec275b719b582ffc1e7ff12a3e726943967156d