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

Change-Id: I2953b6662bfcb6125ee1ba7afdf5922902b59ea6