modtoken
This reverts commit d56a686f83. Reason for revert: T288998#7287717 Bug: T288998 Change-Id: Ia05b00a345335fe8bdd6041323c3abfa79ded169
d56a686f83