Pull recent 10.1 changes into CM10.2