This includes all the API changes already made for CDT 10.0 Change-Id: I3bd4c613af5e9ee3d1529afef7307da09efcbbdf