Merge "Fixed NPE for HoneycombDelegate"
am: f37a3554c4

* commit 'f37a3554c46428f731724ef105a8dc04fc9d16d9':
  Fixed NPE for HoneycombDelegate

Change-Id: Ieb82a9af38bc2577d6a6f8d18479cd9f245b5136