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

Change-Id: I7cb12bfd1dfd5032302e706fae51238cf32a5036