Bug: 37154489 Test: make + manual + unit tests Change-Id: I79e70dea12a65fefcb06aca3fd1891a95d856626
6d50576496