Merge "Count switch as branch." into pi-dev
am: 8863fc3ad7

Change-Id: I0a1fec6448ee3870751aadee14ae4d3e03a6cf75