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