Snap for 8006021 from ca1ebcc270db869099c84b08e37b55f6587766b7 to tm-release

Change-Id: I1bf23c98a6daf350e257f9ce3c453800f4c43389