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