Merge "Modified name, model_name and oem_name to match those of model manifest" into mnc-brillo-dev