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

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