Snap for 8176975 from 1864ba7b87bf20e35b1e1209b01c12b7b70fd62f to tm-release

Change-Id: Idc5f8484e26279fd851128fd4b6fbf6f41344850