am cc456c7f: am 7b9bcf02: am fd5cb76e: am 79490dba: Merge "Fix reintroduction of b/10845061" into mnc-dr-dev

* commit 'cc456c7fda260808c138caf4015697d42f497d2c':
  Fix reintroduction of b/10845061