Merge "Fix broken unit test done by ag/1729776, and added unit test." into nyc-andromeda-dev
am: ace93cfa5c

Change-Id: I9ceda1ed4c7ff5eec4a8dc2f5b9d1934eaf82e59