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