am 84598141: am f90bdb17: (-s ours) am 65d35362: am b5537f7d: Merge "DO NOT MERGE Fix NPE that occurs with poorly behaved widgets" into ics-mr0

* commit '8459814118ba029cdb41b61b608a57213413da81':