Snap for 7272906 from 2d4fa7ed22254e2cf43ad7068ac3439dbb44cc77 to tm-release

Change-Id: Ia858ab806b8c2739d05bba5a91b60775193400f2