Merge \"Enable fingerprint nav by default\" into nyc-mr1-dev
am: 1ac356280c

Change-Id: Id6df513225b539497309783c3d4f11745a147684