Fix name of default

Change-Id: I562dc2572f1d8fdb69f615d1a7f0f425cc27d698
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0