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

Change-Id: I3d1621a65ded4673871bb7dc91b00c09ec2ab311