Merge cherrypicks of [2310351, 2310460, 2310353, 2310371, 2310424, 2310273] into oc-release

Change-Id: If80b445694db4529eaec951413c43157c9acfe35