Merge "Merge "Merge "Merge "Increase the capture timeout to 1500 ms" into nougat-mr1-cts-dev am: 69d80dae08" into oreo-cts-dev am: 897e9c043f" into oreo-mr1-cts-dev am: 4bfd819237" into pie-cts-dev