Merge "Merge cherrypicks of [927301] into android-arch-navigation-release" into android-arch-navigation-release