Fix build errors for CM 10.2

Change-Id: I8f46c8d330be995e46453888711f3dc5ff3db042