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

* commit '7b9bcf02e1954b48a80a9e43df5b25d875172730':
  Fix reintroduction of b/10845061