Merge "RESTRICT AUTOMERGE Add extra battery indication logging" into tm-qpr-dev