bring back browser and calendar

Change-Id: Ia4ef4fa5740cdf07c7f6498b5c8d3e3839762931