Merge cherrypicks of [16492169, 16492171] into studio-chipmunk-release.

Change-Id: I6f4c7e6fb01457561307c6b6e59aa3e20dff21d6