This should make it easier when switching between master
and older branches.

Change-Id: I5be0afc3338fc66a05750b334f4742f7d17f4225