Prepare for cm-10.2/cm-11.0

Change-Id: Ia1d156d9eb817ca62ebc4bb9d163e4cfb62364ef