Snap for 7242881 from 41c0644cd269e0ef3b346d4eccbf0e42bc569800 to sdk-release

Change-Id: I55fbfeafe086a86653872f310b122060a977f722