Snap for 5061196 from 4eb6ecf3cc61ded1e8237778548c3f3a991d05be to master-cuttlefish-testing-release

Change-Id: I4c3fb781698fa3cb3326a5cd35a88f1f01fc25e7