DO NOT MERGE

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

Bug: 120502534
Change-Id: Icf680399c1d836bed4b1ccf06238cb0eaf6bd5a9