Merge "Merge "Fix an NPE that can result from a race condition." into oc-dev...
Merge "Merge "Fix an NPE that can result from a race condition." into oc-dev am: d8aa2ace" into oc-dev-plus-aosp
am: 451afd6b
Change-Id: I42917def6e7e89eca3bc93d51f2c8ddf04349e8a