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