Merge "Default-off FP Swipe" into oc-dr1-dev am: 76303759c4
am: 988c6c8986

Change-Id: I19a89e0e75b21b9d2d9529d9089e053db80130e3