Bug: 37154489 Test: make + manual + unit tests Change-Id: I79e70dea12a65fefcb06aca3fd1891a95d856626
8b8f27cd06
2cbe278ad4