Snap for 5277895 from d9aafaade740ca38612c742f6d87debf362132ea to sdk-release

Change-Id: I4511941e5c576db8fc7bc05bcc4476a8a382edb8