Merge in brillo-m7-mr-dev history after reset to 52909b4b3a1c8058883d6537e1b968a3c47f394e