Merge "Add additional logging to test 1940" am: d79aaab361
am: 00272db694

Change-Id: If4655d562422b4d39e4bba8c0905b018f3640b7b