Merge "Increase the capture timeout to 1500 ms" into nougat-mr1-cts-dev
am: 69d80dae08

Change-Id: Iaf59dc76885f9db13fbdf96c887b68a1dd32ca64