Snap for 7511134 from 25317fae42f5aa04b8c1a6ea31bc15804149b0ee to tm-release

Change-Id: Ib8fc1f1d4880b1f7afb175829b919d07209e97a9