A bit of OPT

Change-Id: Ie6b1235977192b66997463997c89d54d6b7af52c