Merge "Snap for 5314374 from ec7a9ad9e984407c09dee8d5011b982f5649bf68 to android-arch-work-release" into android-arch-work-release