Merge "Disabled BSM mode switch when plugged in" into nyc-mr1-dev am: 4c8776627b
am: b3b0fd931b
am: bc81965891
Change-Id: Ibe60de90217cb7be265ee5b7f41c7ffcfaf4d6ac
This commit is contained in: