Merge "CCSDK-1556 -Move this constructor to comply with Java Code Conventions"