Prepare for cm-10.2/cm-11.0

Change-Id: I5ecaaeb687d68d31c25dcb9848a85083dadb7fa5