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