Port some files from the cm-11.0 branch

Change-Id: Iac1aaaf9bede899936b7724f280aa75abeefe8e5