Merge "Add an exported flag in manifest" am: 27e67ad98b am: 9d6d99ad98

Change-Id: I6097e4a5c6dea0e9cafe1c2949e847bbbc61aa26