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

Change-Id: Ieb654b53b62e082e670eac022bcf658b47f1c157