Merge cherrypicks of [18143360, 18143563] into studio-dolphin-release.

Change-Id: I61389521556747df5c69a429b115a2242ed496df