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

Change-Id: I88cd44f564ecbd3a96dec9e8a4021871295bd636