Merge changes I1055ab85,I7fb5f0de * changes: Add Api type to manifest for BUCK build Adjust Implementation-* manifest entries for BUCK build