Always something in manifest

Change-Id: I731bb7f443f975c8735890d5acd7c5c7672926b4