Merge "Add timeout to racy caption test" into oc-dev
am: 9da4b388c1

Change-Id: If1d1031cc3e6f4b905122af729a4f42908e67bd5