Bug: 155295806 Test: m checkbuild Merged-In: I4cd6647a8707f49363d297a3b3082ef19ba93868 Change-Id: I4cd6647a8707f49363d297a3b3082ef19ba93868 (cherry picked from commit aa4162e7)