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