Fixed archive viewing issues.

Change-Id: Ie15e64528d9896ac07d801c2733647eca2511a38
Merge "Fixed archive viewing issues." into dev