tree c9f2225c30b0867bfc4515b67832359382ee6ef1
parent abd59cc888d44f06c36368299aed2eeea1db7281
parent 2f5be461a0175167813da1021e4da7c4223ab790
author Elliott Hughes <enh@google.com> 1588187715 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588187715 +0000

Backport upstream r1246. am: c4b8830543 am: 195f0b5268 am: 2f5be461a0

Change-Id: Ib3045d188f64856ca536d13497ad3e9f87b69636