Merge "Add more logging to test 1935" am: 63fe8dc454
am: b0d1f09c1e

Change-Id: Id45fa7fa5f140c47ca6aae0a6d4ce49cc9f60cd8