Use most recent revision in rebase and cherry-pick from dashboard

Change-Id: Icdabe05a7a665b8a5606d21c73bf96062fbd2328
6 files changed