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

Change-Id: I776ac55ca48cb9d463f4abe087c71b362ce5327d