Add msm-3.4 crap to clean up compare

Change-Id: I8b5be88422add76a199d1c031328640097fa27d2