Add GerritHub changes (prepare for switchover to new master branch)

Change-Id: I22b4f3824de13f35e09b3b0516148e52a1c266c2