Changes required for git-flow branching model.

Change-Id: Ic241ab9c2a2b471cf4595c7c06f017976b7afaaf