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