fix for lp 1404271

fix for lp 1404274
  This has been fixed in opt.h

Change-Id: Ifce8ad242693598532f1c0c75323015edc6e4e70
Merge "fix for lp 1404271"