Merge "Snap for 5327971 from f094924d2540421b8a578359d104e16388821150 to android-arch-navigation-release" into android-arch-navigation-release