This reverts commit 4f8d3466508f3706e8d3f656294f7c5d3a9a7f88.
Reason for revert: use another method
Change-Id: I2a6465ea507f15ce200ea9cf03994b18bb2f257f
(cherry picked from commit 630248ae566c8cf8c61ceacb74ae3cd31d9e1501)
This reverts commit 576444e746f4de3ab71c91b8a66fa4a64c3427c8.
Reason for revert: <remove high flow of X/P>
Change-Id: I875f649c62d503bdf1321b5fec829bb190b02bce
(cherry picked from commit 0b46acb8e793af883b797f83a9ad72a55dd69f3e)
This reverts commit 74f0c8a63c220d688b503bff87f927c94749eef9.
Reason for revert: <add back now>
jira: none
Change-Id: I07c42c264b820fdd5beff1556f6615b22e278b28
(cherry picked from commit cbaf4d9a12d3aaa3507038d93ee5ecee848f8088)