Fix compilation error in Ubuntu 14.04

Change-Id: I3af8bf9f1b94136d31f4528d8abb4015a5818d3c
Merge "Fix compilation error in Ubuntu 14.04"