Cm 10.2 m7 recent

Just recent commits in the M7 that looked reasonable to merge into ours.