Merge "Changed themes for core activities" into nyc-mr1-dev
am: c43f05e669

Change-Id: I4cda794530cd0abe6b00aed72bb6f7e6eb258f42