DO NOT MERGE

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

Bug: 120502534
Change-Id: I0f0401306f5ad2ed39bf15680e4e519fde66aa7f