Fix one more branch

Change-Id: I8707570cb87aadfd456b5c88d9fe9968dd3abdb5
fix more branches

Change-Id: Ia55024519d30fc78d17dc0718bfc94f6b6d4095a