[automerger skipped] Merge pie-platform-release to master - DO NOT MERGE
am: 84dc1652cd  -s ours

Change-Id: Id12ee9ba61d228e847cf9c32588c30df80140f2d