Add change to modify if to ifdef Change-Id: I49e3841deb4168cbbc4e0a4f045413717aa97d2a CRs-Fixed: 3050747