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