Fix activity fragments

Change-Id: Ia23e83b1438e816a42880ea4f14d74eb2d37f4f2