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