Merge "Revert "Disable test for now."" am: 5dfb2020dc
am: 594053fff5

* commit '594053fff5e21d17409c6fc3bfca84637dd53503':
  Revert "Disable test for now."