Merge "Add an exported flag in manifest" am: b2c198b323 am: fd4351c618 am: 9c6b098d14

Change-Id: Ie2a0d229d988ec0ec500a9796ff3859cf08644c1