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