Compilation issue fix

Change-Id: I31aa40177df93115c189ef7a6cfb407bead1cab7
4 files changed