DO NOT MERGE Add test for bug 62187433 am: ae96c0dee0  -s ours
am: 76ecc59e11  -s ours

Change-Id: I1ff29d73325c473ffd7f25c0fdbcda669944798c