Add back increasing ring feature (2/3).

Change-Id: Iafc79a57651db327a100e0f1723b62f442b638be
Merge remote-tracking branch 'cm/cm-12.0' into HEAD