EcoGallery: Small cleanup

Change-Id: I4a7082c524729ce6439991b81ee3de3a91ff151c
Workspace: Small cleanup

Change-Id: I9fed548754c96d9a81f3aac142edf1cdd8a1b4f5
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1