Merge "Snap for 5343578 from 2f57ac90fbce9d57db7dde3574bee70adc83aaed to android-arch-work-release" into android-arch-work-release