Merge "Fix formatting errors in sensors MH2 bp files" am: 30fc7d4ba3 am: 59c1adabc7 am: 217167bf87

Change-Id: I55b5eebb64c27f3559de3badf139f0efdf35e458