DO NOT MERGE

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

Bug: 120502534
Change-Id: Ic8c3d84d54b17e45c55c16ae22e7f87eb79a7e8e