Tweak OEM mode

Change-Id: Ic440e33fa22aa7b082097366f10b333cc945362a