am 6f24e484: (-s ours) am 1520d60c: am 79a677cf: am fffd025d: am 74af8088: Corrected issue where history icon placement does not match spec. DO NOT MERGE
* commit '6f24e484':
Corrected issue where history icon placement does not match spec. DO NOT MERGE