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