Merge in cm-11.0 updates.

Change-Id: I1a82afc651e377b5bab3b6d82779572e86bb27b6