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