Add test for bug 34360591 am: b3f1851004 am: a3c1c152b7
am: 7db8c59b77

Change-Id: Ic6462477a8b58a20b17b65a6473e01865f8aaa2f