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