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

Change-Id: Ice0e3330502330dde934d7e7544e466fcffcacca