Bug: 183407956 Test: make, CTS test Change-Id: I0ff68f29865c0bb2b316b3fc73d2c5adc37e4a36 (cherry picked from commit b13eb2c4)