Merge "Debug: Add test for bug 31943543"
am: 7c4efe421c

Change-Id: I4d1a78aa19473e29a121e20ec8c4e07dd202da89