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