Merge "Merge "Fix 'history' text" into rvc-dev am: 21e618d9ba am: 5ce4c6485f am: f4629a882f" into rvc-qpr-dev-plus-aosp am: 09d5d36ee8
Change-Id: I269fef9ae181440e0a70aff73e922e73171631dc
This commit is contained in: