Merge "Update the Statement Service. DO NOT MERGE" into mnc-dev