Fix broken unit test done by ag/1729776, and added unit test.
am: f085da0311

Change-Id: I3f1a2e6c887b5c6f9e4c29e5372ecbf3fb7bce81