Merge cherrypicks of [2549775, 2549776] into oc-dr1-release

Change-Id: I7d547c1f06915e048f186f24eb2ec3404cf8fc59