Merge "Bypass the test if fingerprint feature is not supported" into oc-dev am: 60e2f125d9 am: 02c5672c40
am: 3d4d1c2092

Change-Id: I1bee4b032db47108c029e6051f57aa1b494fbf85