Merge cherrypicks of [1120805, 1120567] into sdk-release

Change-Id: I13d6b53a2edd773f1a6fcd39ff6537d6b23332fb