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

Change-Id: I0e606e83a43da263820f5f0ece892c7d0710e5d8