manual merge of 10/10 CCSP drop

Change-Id: Ia580ee69a9f78c93d26c1360fe79f9f55c751ff3