Changes to support bug 2750953.

Change-Id: I95060b46314f33597b5deefcaec529498ff5b97e
3 files changed