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