Merge "Fix racy clone" into oc-dev
am: a5b396b5cb

Change-Id: I718db73f8716b274de9efb94e297e3409ea9b46c