Snap for 7110312 from 6b58040b5882a0fddbbb4a6ad8c9741333fceee3 to tm-release

Change-Id: I1f3bebaa7af514c8b7d69f63d9ba9570906c78e3