DO NOT MERGE

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

Bug: 120502534
Change-Id: I381d4e2ea47301d68a7f8f7ff91a9036ec182c80