Merge "Contacts: Fix NPE in QuickContactActivity in monkey test" am: 6529af3c9c am: a33aca875a am: a90442f350 am: d59df30b8b
am: 53985a4e2c

Change-Id: I88d38e833f401138a2fec2e4bcbb4fece65b6bf2