Bug: 210023167 Test: compilation Merged-In: Ief078770b44719e105828bb61d3768ad24e277dd Change-Id: Ief078770b44719e105828bb61d3768ad24e277dd (cherry picked from commit 793736cc)