Merge "mpq8064: bringup changes"