Merge \"Added customizable default system theme.\" into nyc-mr1-dev
am: e57e9e5096

Change-Id: I304fb65ef724c2a08c0ad6ed9805fc5f8683d6cc