Snap for 8023588 from 4e22457b28cf54f96d91492b3c58fe887810f98c to tm-release

Change-Id: I21c27b54c1775ad74c4dea39c87b21ff8595b001