Merge "Fill in partial cherry-pick"
am: 6b7dd3891d

Change-Id: Ia8a9df1d3bb49b4c7cbfb5c85805e9517dc26b28