Merge "Merge "CTS coverage: connectivity change, photo, + video" into nyc-dev am: f057299a13 am: 1a9e5fd490" into nyc-mr1-dev-plus-aosp