Merge "Merge "Support adding custom tags to APIs." am: 841022227d am: 5349732bf4 am: 571321c458 am: bc01819b67"