Snap for 8006021 from ce209ea135636ba3e355ba72a9fe1a8a8cf97aa7 to tm-release Change-Id: Ia1b10f468a3503c3381849ddf92cdd8f516a963a
This is a part of plotters project. For more details, please check the following links: