[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am: e5950df00b  -s ours

Change-Id: Id2fb3760604cf42f2d6b7535ba2324ed74b59f63