Merge "sintf.xml => manifest.xml" am: aeec3bfde7 am: 28070816fb
am: 1b510a9705

Change-Id: I6fb3f8c4f44d4f3fe68a915b1a6f85fc7db5c107