am 2b662e8e: Merge "Fix a NPE in MenuItemImpl when setting null ActionProvider" into jb-mr2-dev

* commit '2b662e8ef96c645e38a3debc29afa7454664f6cb':
  Fix a NPE in MenuItemImpl when setting null ActionProvider