Merge "Reorganized activities in manifests."
am: 19b1916861

Change-Id: Ib7ce4396c4aa8314f3608e26540df84f670f1b1d