Merge remote-tracking branch 'skiwong20/cm-11.0' into skiwong20

Change-Id: Id450c3ac524552df11eafd9a47063761b341514d