Revert e8c629b..7151224

This rolls back to commit e8c629b2b0d91a5bffb1750ffa53c02d35bf090b.
Revert 7151224..89fface

This rolls back to commit 715122487c64c2aded373770726111bfda348d79.
changes by amanjot

changes in xml files as well analysis activity.java