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

Change-Id: Iaaa8b0ebfa73f5567dc4dfc84d23ed47bb0c3827