Underp an ifdef

Change-Id: If0e0f1fddcad3d7ec6987ecc5d4e6a40e605c39a
Merge remote-tracking branch 'cm/cm-11.0' into HEAD