Merge "Add test for https://android-review.googlesource.com/99853 ."