Merge cherrypicks of [2325207, 2325192, 2325307, 2325156, 2325272, 2325195, 2325326, 2325273, 2325289] into oc-release

Change-Id: Ic83e8db73eb0ca037369a997e4abdb633b8d8cfb