Merge "Snap for 5311349 from 735cf2cc38af8b506446db5d7ee45b71b75f0c10 to android-arch-navigation-release" into android-arch-navigation-release