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

Change-Id: I71e8b7288fad93041e0acef5e662b626f8b4f678