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