Bring our default manifests more closer to us ;)

Change-Id: I069284c1867ad951e36357b566c1fee5dca0143e