Merge "Snap for 5344561 from a3f27c9df5c9b471ad08ca0927ae5223378c0eba to android-arch-work-release" into android-arch-work-release