Merge "Add regression test for b/35305951"
am: 0e48cfdaef

Change-Id: I52a6e147b1de2ba5e702d72bd81a23dd43bc5b9b