DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master

Bug: 120502534
Change-Id: I540c4d84dbaa45e59f24edfe3fa96003b6315191