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

Change-Id: I7218c2a3905b42372b104ef08009ef04773706d5