Merge cherrypicks of [4902728, 4902589, 4902590] into oc-m7-release

Change-Id: I5407f09b1990560b4908fd78be454f3e57d7a363