Changes required for git-flow branching model.

Change-Id: I6cf02588ca14d064731bc1d26f022f9b680fdc53