Snap for 4429331 from c79d4eae757a81270915c2a7cf01c81b8d42785e to sdk-release

Change-Id: I19a41739be581387c2aa70b970b9a9486e24138d