Merge "Fix OTP performance with no Vendor ID device" am: 6ecaac4c9f am: b88d9b4593
am: 0f279d4577

Change-Id: I0f8bb0736384cafd60180e658ecbe08a464db8d4