Merge cherrypicks of [2903504, 2902882, 2902883, 2903505, 2903506, 2902675, 2902677, 2902679, 2902681, 2902682, 2902683, 2902684, 2902685, 2902687, 2903524, 2902884, 2903525] into mnc-mr2-release

Change-Id: I3a3e97b0299fcac639d8bd31c7406a6491bf509d