Merge "Add an exported flag in manifest" am: bac3f8ae4d am: d535ef26a6

Change-Id: Ife71a8e8e15fc5058bc4bcd7d85f11015d01719d