Merge cherrypicks of [4995494, 4995495, 4995496, 4995497, 4997652, 4997881, 4997052, 4997883, 4995518, 4997653, 4997654] into oc-m8-release

Change-Id: I07fac7857786280ae052a33787c6ca32bc7edf7f