Merge "Add support for carrier demo mode" into nyc-mr2-dev
am: 482ba6b831

Change-Id: If0368c791ec1d866fc46bd781a5adb4c1bc14186