Merge "EffectiveNavigation: Revive an old sample am: 559783ec am: cd20fac4 am: 2dbbd91e" into nyc-mr2-dev-plus-aosp am: e74e53e7 Change-Id: Ic3d118b9be413c3d42443555dc264ea33e418000