Remove smb347-battery if other battery is specified
Merge branch 'nexus-3.17/smb345' into nexus-3.17/base