am 4f3cb091: Merge remote branch \'goog/ics-mr0\' into ics-mr1

* commit '4f3cb091d6ded1e31db8dd21f019073a7cc9a2e2':
  Updated bug fix for Launcher reloading on mcc update.