Snap for 8005954 from 07e06ee695b39db961623990676680ac11e9d4e3 to sdk-release

Change-Id: Id7a428e3ae4fddf84108122e9f32cb2091f73da0