Merge "Add an exported flag in manifest" am: 47f31ce7ae am: 0d54a1dd67

Change-Id: Iaedfa10e041a2f8bc3b66fb8a01d3696dc43931a