DO NOT MERGE

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

Bug: 120502534
Change-Id: I988ec52061de83085d7c47d002f79ff66a7ff80a