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

Change-Id: I9f71dd1bf81105c0b67ba7a6229bd15ace43e793