am ccdd86e3: am 0527f944: (-s ours) am b5537f7d: Merge "DO NOT MERGE Fix NPE that occurs with poorly behaved widgets" into ics-mr0

* commit 'ccdd86e36afcd9e558ca1deb13695340a2683142':
  DO NOT MERGE Fix NPE that occurs with poorly behaved widgets