Fix compilation error in ubuntu-14.04

Change-Id: I2c9b217fe03f2fbf214911cd587625a20cafaaf1
Merge "Fix compilation error in ubuntu-14.04"