tree ea8a34f0c122aa4bef66f521a456d1c016688468
parent 69f5594ef6a4a13fac8b001421b302a9a0b4a009
author Baligh Uddin <baligh@google.com> 1441143523 -0700
committer Baligh Uddin <baligh@google.com> 1441144423 -0700

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

Bug: 22943772