Merge "Fix Race Condition" am: 1d9f60bccc

Change-Id: Ia13cbf8e1afa085c09883a049d375c2916021525