Merge pie-platform-release (PPRL.181205.001, history only) into master Bug: 120502534 Change-Id: Iaabfb1d6d2ac3f3d4528cf2a7192bf2eb4669784