This ensures both branches are in-sync and have not diverged. Change-Id: Ib487d8596037017b9ec03d7e8a76229373c153db