Merge cherrypicks of [2912137, 2912209, 2912210, 2912151, 2912152, 2911092, 2911093, 2911094, 2911095, 2911096] into oc-dr3-release

Change-Id: Ie95b996dcb1b35bcc65b79b12244ef640a9659af