[automerger skipped] Merge "Fix Race Condition" am: 1d9f60bccc am: 43bfaf2fda -s ours
am skip reason: Change-Id I04ae2f7ed025f5ce8bc4fdeb7f10717e20d76282 with SHA-1 9ec159ac1f is in history
Change-Id: Ia2cdc83971e498e4880e91b20430c3a8ff840716
This commit is contained in: