Merge "Add an exported flag in manifest" am: 1234347a82

Change-Id: I1bfa10b720768bc4419ed43340f2902ea15b992d