Snap for 7110675 from 5e5aac0e1b07a933094913227d0175d8d993390a to sdk-release

Change-Id: Ibd254c9a5b81962a7e453fe8922f5cdb5f745c70