Try to CP ag/749963 from klp-dev into lmp-mr1-release

Bug: 22943772
2 files changed