Merge "Adding sattiraju@ as OWNER and also changing the order of ldaps to be alphabetical"