Merge cherrypicks of [2577718, 2577724] into oc-dr1-release

Change-Id: Iebc2dad4bdc32e4c3654e54faafa65ec0710d9f8