Merge "Prepare for enabling H302 rule(services/identity)"