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

Change-Id: I2ec2f866a2cf75760708c5e79b9b59b1e590c117