Merge "Remove MSC_ANDROID_TIME_SEC usages"