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

Change-Id: Ia72dda69495f732e2a4a8abcee679a3c6beabab4