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

Change-Id: Ife1a56225d27833a5269883ab71b169966a7b139