more branch updates

Change-Id: Icadc097a5efbc6ad21bb552cc99ce293852360eb