am 2b2959b3: (-s ours) am e5da8565: DO NOT MERGE Add support for additional System Update menu item

* commit '2b2959b32141e86a0de880ded77c3ef63a081e0f':
  DO NOT MERGE Add support for additional System Update menu item