merge cm-11.0 m8 into orca 5