Merge cherrypicks of [16017025] into sc-release.

Change-Id: If87f3e57ef75990b4bd994ff1fd9e446c1dfd9d7