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

* commit '79490dbacd90a851ed8d03d64acedbf3616adba4':
  Fix reintroduction of b/10845061