Merge "Add CTS for bug 170240631" into oc-dev