Bug: 64131637 Test: Build Change-Id: I083469c496ce889f61d5ece45232c251f3c861e5 (cherry picked from commit aebdbe3c) Merged-in: I083469c496ce889f61d5ece45232c251f3c861e5