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