Merge "Fix #62169466 bug report sharing options empty" into oc-dev
am: 4d473c65cb

Change-Id: I13b21aa8b731e09d22955d177589635427c1fb39