Merge "use annotations instead XML for BP in impl"