Fix hamilton compilation issue Change-Id: Icd92286eec7369e8bc77cebb6e6b74b180a15aff CRs-Fixed: 3066567