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