Merge "Refractor msmpeafowl to sdm670"