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

Change-Id: Ie118dbcc8a9b660c1def58a084598bebca99faf3