Merge "Adding temporary logging to debug CTS failure (for CellLocationTest)." into mnc-dev