Snap for 7732471 from bbc958cf174ba90630989a819292c4e45f9574ad to tm-release

Change-Id: I893b6ca167bc5a1acaab9dde74b643fa0a00459e