Merge "Rename flag and attribute per API council" into lmp-dev