am 4ef0d01b: am b547c5e9: Merge commit \'ec9354f7\' into manualmerge

* commit '4ef0d01b7a1de28fc494f43c8e0c199178f2daab':
  DO NOT MERGE Fix IllegalStateException in InCallUI