Snap for 5061196 from e209a8f48f4ccb755b7d785de1a7e7c809a625d2 to master-cuttlefish-testing-release

Change-Id: I1c35651409b3d0bb435e947e4de7c1e7bae12e4e