Merge "Make updatedMillis a private field"