Snap for 8581162 from 19a244c33ec1990f81a430f28bb9b9b0c6932ca0 to tm-release

Change-Id: Ic5d3715539651b810e7ff69c3340b45789d5240b