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

* commit '73904fed884bf216b51acdc64402c427cc34725b':
  Add test for https://android-review.googlesource.com/99853 .