merge in brillo-m7-release history after reset to brillo-m7-dev