Snap for 7183507 from 1a641a11cc4e8093e6c6863ff3aa8ac2c8aa3cdd to sdk-release

Change-Id: I9e4b41e9365c062bbd683827d7d241290b1214cd