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