Change-Id: I0a66a69b68d975389302ae4361c9c106eb722538
Big thanks to Dees_Troy for helping with the implementation. Change-Id: I6c9c522b9c9de5dc139e2ecb0141008182ba07f0