(cherry picked from commit 94837e35) Bug: 65843255 Test: build Merged-In: Icc748dd14b52641e37b149f51d61a4086e55ed41 Change-Id: Icc748dd14b52641e37b149f51d61a4086e55ed41