A few more QC things to cm-11.0

Change-Id: I60252ced81c83c8f71417332e1697ff6b13718b8