aries:sync with cm11