Merge "Merge "Fix 'history' text" into rvc-dev am: 21e618d9 am: 5ce4c648 am: f4629a88" into rvc-qpr-dev-plus-aosp