Added unit tests for b/25434120 regression.
am: 3cfa97d4c1

* commit '3cfa97d4c14fa4af3ee3613e44ba7b7128141e31':
  Added unit tests for b/25434120 regression.