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