try p500 rebase again

Change-Id: Ia57736f1457a282b8afaef5985fa9a36ac0577d7