c7a7234415
TrivialFix Sort the containers, remove *_data ones, etc. Change-Id: Ic7923828517da954e7c8802d6cf5918e425df255