Bug: 120910747 Test: build and run the unit test Change-Id: Id1feb51a1577e9d0c90bff812d78e581e5dc5168