totemc2: additional fixes for 4.3 bring up

Change-Id: If5dc43c7b0be1b2894c889a8e6e9c2de45792d63