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