Snap for 8006021 from a904df74449bfdec5ff2413e0d27521a2a14e61f to tm-release

Change-Id: Ia934a9799269b18c646c60dabebe102e9a9afe73