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