Fix a build bug

Change-Id: Icb11da9fafc6d834b0b3933618e2496dd0171479
Merge commit 'bbb6f9fc39d66462406636382b777e3ac334a1bb' into cm-11.0