updates for cm10.1

Change-Id: I894206abb7ebcf863190d615c3fc1ac1fcf15eb2