Merge "Snap for 5338783 from bb017c89ce1f56fbc5e342c5d4c17f4b071e725f to android-arch-navigation-release" into android-arch-navigation-release