Snap for 5061196 from cedb9c8bc5ec9f5f9a6c0f208277b4560bbd499f to master-cuttlefish-testing-release Change-Id: Ic7629a40db3f916cdf4cf5770be309da78e27bb6