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